[WebAssembly] support getVT from externref and funcref - #97080
Closed
HerrCai0907 wants to merge 5 commits into
Closed
[WebAssembly] support getVT from externref and funcref#97080HerrCai0907 wants to merge 5 commits into
externref and funcref#97080HerrCai0907 wants to merge 5 commits into
Conversation
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-backend-webassembly @llvm/pr-subscribers-llvm-ir Author: Congcong Cai (HerrCai0907) ChangesFixes: #69894 Full diff: https://github.com/llvm/llvm-project/pull/97080.diff 4 Files Affected:
diff --git a/clang/test/CodeGen/WebAssembly/wasm-externref-novec.c b/clang/test/CodeGen/WebAssembly/wasm-externref-novec.c
new file mode 100644
index 0000000000000..d91072f379623
--- /dev/null
+++ b/clang/test/CodeGen/WebAssembly/wasm-externref-novec.c
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -O2 -triple wasm32-unknown-unknown-wasm -target-feature +reference-types -emit-llvm -o - %s | FileCheck %s
+
+// From issue 69894. Reftypes need to be marked as not valid as vector elements.
+
+__externref_t foo(void);
+// CHECK: declare ptr addrspace(10) @foo()
+
+void bar(__externref_t);
+// CHECK: declare void @bar(ptr addrspace(10))
+
+void test(int flag, __externref_t ref1, __externref_t ref2) {
+ if (flag) {
+ ref1 = foo();
+ ref2 = foo();
+ }
+ bar(ref1);
+ bar(ref2);
+}
diff --git a/llvm/include/llvm/IR/Type.h b/llvm/include/llvm/IR/Type.h
index 1f0133c08e7d6..cacb0539b3ddf 100644
--- a/llvm/include/llvm/IR/Type.h
+++ b/llvm/include/llvm/IR/Type.h
@@ -479,6 +479,8 @@ class Type {
}
static Type *getFloatingPointTy(LLVMContext &C, const fltSemantics &S);
+ static constexpr unsigned WasmExternrefAddressSpace = 10;
+ static constexpr unsigned WasmFuncrefAddressSpace = 20;
//===--------------------------------------------------------------------===//
// Convenience methods for getting pointer types.
//
diff --git a/llvm/lib/CodeGen/ValueTypes.cpp b/llvm/lib/CodeGen/ValueTypes.cpp
index b0f736a49c20e..5aa7c406206d9 100644
--- a/llvm/lib/CodeGen/ValueTypes.cpp
+++ b/llvm/lib/CodeGen/ValueTypes.cpp
@@ -263,6 +263,15 @@ MVT MVT::getVT(Type *Ty, bool HandleUnknown){
getVT(VTy->getElementType(), /*HandleUnknown=*/ false),
VTy->getElementCount());
}
+ case Type::PointerTyID: {
+ if (Ty->getPointerAddressSpace() == Type::WasmExternrefAddressSpace)
+ return MVT(MVT::externref);
+ if (Ty->getPointerAddressSpace() == Type::WasmFuncrefAddressSpace)
+ return MVT(MVT::funcref);
+ if (HandleUnknown)
+ return MVT(MVT::Other);
+ llvm_unreachable("Unknown pointer type!");
+ }
}
}
diff --git a/llvm/lib/IR/Type.cpp b/llvm/lib/IR/Type.cpp
index 5c61ad9f000b0..2279b5eb873b7 100644
--- a/llvm/lib/IR/Type.cpp
+++ b/llvm/lib/IR/Type.cpp
@@ -261,13 +261,13 @@ IntegerType *Type::getIntNTy(LLVMContext &C, unsigned N) {
Type *Type::getWasm_ExternrefTy(LLVMContext &C) {
// opaque pointer in addrspace(10)
- static PointerType *Ty = PointerType::get(C, 10);
+ static PointerType *Ty = PointerType::get(C, WasmExternrefAddressSpace);
return Ty;
}
Type *Type::getWasm_FuncrefTy(LLVMContext &C) {
// opaque pointer in addrspace(20)
- static PointerType *Ty = PointerType::get(C, 20);
+ static PointerType *Ty = PointerType::get(C, WasmFuncrefAddressSpace);
return Ty;
}
|
Member
|
@llvm/pr-subscribers-clang Author: Congcong Cai (HerrCai0907) ChangesFixes: #69894 Full diff: https://github.com/llvm/llvm-project/pull/97080.diff 4 Files Affected:
diff --git a/clang/test/CodeGen/WebAssembly/wasm-externref-novec.c b/clang/test/CodeGen/WebAssembly/wasm-externref-novec.c
new file mode 100644
index 0000000000000..d91072f379623
--- /dev/null
+++ b/clang/test/CodeGen/WebAssembly/wasm-externref-novec.c
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -O2 -triple wasm32-unknown-unknown-wasm -target-feature +reference-types -emit-llvm -o - %s | FileCheck %s
+
+// From issue 69894. Reftypes need to be marked as not valid as vector elements.
+
+__externref_t foo(void);
+// CHECK: declare ptr addrspace(10) @foo()
+
+void bar(__externref_t);
+// CHECK: declare void @bar(ptr addrspace(10))
+
+void test(int flag, __externref_t ref1, __externref_t ref2) {
+ if (flag) {
+ ref1 = foo();
+ ref2 = foo();
+ }
+ bar(ref1);
+ bar(ref2);
+}
diff --git a/llvm/include/llvm/IR/Type.h b/llvm/include/llvm/IR/Type.h
index 1f0133c08e7d6..cacb0539b3ddf 100644
--- a/llvm/include/llvm/IR/Type.h
+++ b/llvm/include/llvm/IR/Type.h
@@ -479,6 +479,8 @@ class Type {
}
static Type *getFloatingPointTy(LLVMContext &C, const fltSemantics &S);
+ static constexpr unsigned WasmExternrefAddressSpace = 10;
+ static constexpr unsigned WasmFuncrefAddressSpace = 20;
//===--------------------------------------------------------------------===//
// Convenience methods for getting pointer types.
//
diff --git a/llvm/lib/CodeGen/ValueTypes.cpp b/llvm/lib/CodeGen/ValueTypes.cpp
index b0f736a49c20e..5aa7c406206d9 100644
--- a/llvm/lib/CodeGen/ValueTypes.cpp
+++ b/llvm/lib/CodeGen/ValueTypes.cpp
@@ -263,6 +263,15 @@ MVT MVT::getVT(Type *Ty, bool HandleUnknown){
getVT(VTy->getElementType(), /*HandleUnknown=*/ false),
VTy->getElementCount());
}
+ case Type::PointerTyID: {
+ if (Ty->getPointerAddressSpace() == Type::WasmExternrefAddressSpace)
+ return MVT(MVT::externref);
+ if (Ty->getPointerAddressSpace() == Type::WasmFuncrefAddressSpace)
+ return MVT(MVT::funcref);
+ if (HandleUnknown)
+ return MVT(MVT::Other);
+ llvm_unreachable("Unknown pointer type!");
+ }
}
}
diff --git a/llvm/lib/IR/Type.cpp b/llvm/lib/IR/Type.cpp
index 5c61ad9f000b0..2279b5eb873b7 100644
--- a/llvm/lib/IR/Type.cpp
+++ b/llvm/lib/IR/Type.cpp
@@ -261,13 +261,13 @@ IntegerType *Type::getIntNTy(LLVMContext &C, unsigned N) {
Type *Type::getWasm_ExternrefTy(LLVMContext &C) {
// opaque pointer in addrspace(10)
- static PointerType *Ty = PointerType::get(C, 10);
+ static PointerType *Ty = PointerType::get(C, WasmExternrefAddressSpace);
return Ty;
}
Type *Type::getWasm_FuncrefTy(LLVMContext &C) {
// opaque pointer in addrspace(20)
- static PointerType *Ty = PointerType::get(C, 20);
+ static PointerType *Ty = PointerType::get(C, WasmFuncrefAddressSpace);
return Ty;
}
|
aheejin
reviewed
Jun 29, 2024
aheejin
left a comment
aheejin
left a comment
Member
There was a problem hiding this comment.
What happens if you compile a file that really vectorizes reference types? The attached test doesn't seem to actually end up getting vectorized after all. Can you add a test that get vectorized?
Contributor
Author
Is it possible to vectorize external reference types? I don't think there are valid test case for it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #69894
#71069 try to treat
externrefas invalid element type but It should be a normal opaque pointer containing some unknown data.getVTshould be inverse operation ofgetTypeForEVTwhich convertMVT::externreftoexternref.